-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[BEAM-11805] Replace user-agent for spanner #13990
[BEAM-11805] Replace user-agent for spanner #13990
Conversation
@TheNeuralBit - This patch has the following checkstyle violation. Can you help with this? |
Replace the import |
Run Java PreCommit |
@nielm @thiagotnunes - Thanks Please take a look. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@allenpradeep could you also cherry-pick the the version update commits from #13765? They were rolled back in #13792. I'd like to apply both changes at once to make sure they pass CI before merging.
.../google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
Outdated
Show resolved
Hide resolved
Run Java PreCommit |
.../google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
Show resolved
Hide resolved
There were some spanner test issues with the previous commit. I'll cherry pick #13765 after the integration tests passes and resend. |
860ea1e
to
e8cb006
Compare
@TheNeuralBit - cherry-picked the the 2 commits from #13765. |
Run Java PreCommit |
Codecov Report
@@ Coverage Diff @@
## master #13990 +/- ##
=======================================
Coverage 82.94% 82.94%
=======================================
Files 469 469
Lines 58343 58343
=======================================
+ Hits 48394 48395 +1
+ Misses 9949 9948 -1
Continue to review full report at Codecov.
|
Run Java PreCommit |
Run Java PostCommit |
@allenpradeep The merge conflict looks to be due to #13804, which upgraded guava. I don't think it's an actual conflict, it's just that 007c0ab is upgrading gRPC, which is on an adjacent line. The resolution should be to just make sure we upgrade both. |
e8cb006
to
a88a034
Compare
@TheNeuralBit |
Run Java PostCommit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @allenpradeep, I will merge when CI is green.
.../google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerAccessor.java
Show resolved
Hide resolved
Failure is a flake in FhirIOReadIT. I'll go ahead and merge. |
…nner (apache#13990)" (apache#15591) This partially reverts commit 4f78ab3.
This patch contains the workaround to replace the user-agent for spanner.
R: @TheNeuralBit @nielm
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
R: @username
).[BEAM-XXX] Fixes bug in ApproximateQuantiles
, where you replaceBEAM-XXX
with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.CHANGES.md
with noteworthy changes.See the Contributor Guide for more tips on how to make review process smoother.
Post-Commit Tests Status (on master branch)
Pre-Commit Tests Status (on master branch)
See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.
GitHub Actions Tests Status (on master branch)
See CI.md for more information about GitHub Actions CI.